diff --git a/adminchannel.py b/adminchannel.py
index 1817040323..afac03571c 100644
--- a/adminchannel.py
+++ b/adminchannel.py
@@ -1,6 +1,6 @@
 # coding=utf-8
 """
-admin.py - Willie Admin Module
+adminchannel.py - Willie Admin Module
 Copyright 2010-2011, Michael Yanovich, Alek Rollyson, and Edward Powell
 Copyright © 2012, Elad Alfassa <elad@fedoraproject.org>
 Licensed under the Eiffel Forum License 2.
@@ -12,6 +12,19 @@
 import re
 from willie.module import commands, priority, OP
 
+STRINGS = {'NOT_ENOUGH_ARGS': 'Not enough arguments specified',
+           'TOO_MANY_ARGS': 'Too many arguments specified',
+           'NO_PERMISSION': 'You do not have permission to do this',
+           'NO_CHANNEL': 'The channel provided is invalid or one was not\
+                          specified',
+           'INVALID_MASK': 'The mask provided is invalid',
+           'NO_TOPIC': 'The topic privided is invalid or one was not\
+                        specified',
+           'NO_DATABASE': 'Could not connect to the Database',
+           'DEFAULT_KICK_REASON': 'No reason specified',
+           'ERROR_PREFIX': '[ERROR]',
+           'ERROR_MESSAGE_FORMAT': '%s %s'}
+
 
 def setup(bot):
     #Having a db means pref's exists. Later, we can just use `if bot.db`.
@@ -22,304 +35,588 @@ def setup(bot):
 @commands('op')
 def op(bot, trigger):
     """
+    USE: .op [#channel] [nick]
+
     Command to op users in a room. If no nick is given,
-    willie will op the nick who sent the command
+    willie will op the nick who sent the command in the
+    channel it was issues in. This can also be issued via
+    PM.
+
+    Note: Bot must be OP
     """
-    if bot.privileges[trigger.sender][trigger.nick] >= OP:
-        nick = trigger.group(2)
-        channel = trigger.sender
-        if not nick:
-            nick = trigger.nick
-        bot.write(['MODE', channel, "+o", nick])
+
+    # If there are no arguments then return the USE statement
+    if len(trigger.group().split()) < 2:
+        bot.say('%s' % cleanDoc(op))
+        return
+
+    # Let's make sure we are not trying to op the bot, since it should
+    # already be op and if it is not, the command will not work anyway.
+    if bot.config.nick not in trigger.group().split():
+        setMode(bot, trigger, '+o')
 
 
 @commands('deop')
 def deop(bot, trigger):
     """
+    USE: .deop [#channel] [nick]
+
     Command to deop users in a room. If no nick is given,
-    willie will deop the nick who sent the command
+    willie will deop the nick who sent the command in the
+    channel it was issues in. This can also be issued via
+    PM.
+
+    Note: Bot must be OP
     """
-    if bot.privileges[trigger.sender][trigger.nick] >= OP:
-        nick = trigger.group(2)
-        channel = trigger.sender
-        if not nick:
-            nick = trigger.nick
-        bot.write(['MODE', channel, "-o", nick])
+
+    # If there are no arguments then return the USE statement
+    if len(trigger.group().split()) < 2:
+        bot.say('%s' % cleanDoc(deop))
+        return
+
+    setMode(bot, trigger, '-o')
 
 
 @commands('voice')
 def voice(bot, trigger):
     """
+    USE: .voice [#channel] [nick]
+
     Command to voice users in a room. If no nick is given,
-    willie will voice the nick who sent the command
+    willie will voice the nick who sent the command in the
+    channel it was issues in. This can also be issued via
+    PM.
+
+    Note: Bot must be OP
     """
-    if bot.privileges[trigger.sender][trigger.nick] >= OP:
-        nick = trigger.group(2)
-        channel = trigger.sender
-        if not nick:
-            nick = trigger.nick
-        bot.write(['MODE', channel, "+v", nick])
+
+    # If there are no arguments then return the USE statement
+    if len(trigger.group().split()) < 2:
+        bot.say('%s' % cleanDoc(voice))
+        return
+
+    setMode(bot, trigger, '+v')
 
 
 @commands('devoice')
 def devoice(bot, trigger):
     """
+    USE: .devoice [#channel] [nick]
+
     Command to devoice users in a room. If no nick is given,
-    willie will devoice the nick who sent the command
+    willie will voice the nick who sent the command in the
+    channel it was issues in. This can also be issued via
+    PM.
+
+    Note: Bot must be OP
     """
-    if bot.privileges[trigger.sender][trigger.nick] >= OP:
-        nick = trigger.group(2)
-        channel = trigger.sender
-        if not nick:
-            nick = trigger.nick
-        bot.write(['MODE', channel, "-v", nick])
+
+    # If there are no arguments then return the USE statement
+    if len(trigger.group().split()) < 2:
+        bot.say('%s' % cleanDoc(devoice))
+        return
+
+    setMode(bot, trigger, '-v')
 
 
 @commands('kick')
 @priority('high')
 def kick(bot, trigger):
     """
-    Kick a user from the channel.
+    USE: .kick [#channel] nick
+
+    Command to Kick a user from a room.
+
+    Note: Bot must be OP
     """
-    text = trigger.group().split()
-    argc = len(text)
-    if argc < 2:
-        return
-    opt = text[1]
-    nick = opt
-    channel = trigger.sender
-    reasonidx = 2
-    if opt.startswith('#'):
-        if argc < 3:
-            return
-        nick = text[2]
-        channel = opt
-        reasonidx = 3
-    reason = ' '.join(text[reasonidx:])
-    if bot.privileges[channel][trigger.nick] < OP:
+
+    # If there are no arguments then return the USE statement
+    if len(trigger.group().split()) < 2:
+        bot.say('%s' % cleanDoc(kick))
         return
-    if nick != bot.config.nick:
-        bot.write(['KICK', channel, nick], text=reason)
 
+    args = trigger.group().split()
+    argc = len(args) - 1
+    reasonidx = 1
 
-def configureHostMask(mask):
-    if mask == '*!*@*':
-        return mask
-    if re.match('^[^.@!/]+$', mask) is not None:
-        return '%s!*@*' % mask
-    if re.match('^[^@!]+$', mask) is not None:
-        return '*!*@%s' % mask
+    if argc == 1:
+        nick = args[1]
+        channel = trigger.sender
+    elif argc == 2:
+        if args[1].startswith('#'):
+            channel, nick = args[1:3]
+        elif args[2].startswith('#'):
+            nick, channel = args[1:3]
+        else:
+            nick = args[1]
+            channel = trigger.sender
+            reasonidx = 2
+    elif argc > 2:
+        if args[1].startswith('#'):
+            channel, nick = args[1:3]
+            reasonidx = 3
+        elif args[2].startswith('#'):
+            nick, channel = args[1:3]
+            reasonidx = 3
+        else:
+            nick = args[1]
+            channel = trigger.sender
+            reasonidx = 2
+    else:
+        bot.reply(STRINGS.get('ERROR_MESSAGE_FORMAT') %
+                             (STRINGS.get('ERROR_PREFIX'), e.message))
+        return
 
-    m = re.match('^([^!@]+)@$', mask)
-    if m is not None:
-        return '*!%s@*' % m.group(1)
+    if reasonidx > 1:
+        reason = ' '.join(args[reasonidx:])
+    else:
+        reason = DEFAULT_KICK_REASON
 
-    m = re.match('^([^!@]+)@([^@!]+)$', mask)
-    if m is not None:
-        return '*!%s@%s' % (m.group(1), m.group(2))
+    if not permissionsCheck(bot, channel, trigger.nick):
+        bot.reply(STRINGS.get('ERROR_MESSAGE_FORMAT') %
+                             (STRINGS.get('ERROR_PREFIX'), e.message))
+        return
 
-    m = re.match('^([^!@]+)!(^[!@]+)@?$', mask)
-    if m is not None:
-        return '%s!%s@*' % (m.group(1), m.group(2))
-    return ''
+    if nick != bot.config.nick:
+        bot.write(['KICK', channel, nick], text=reason)
 
 
 @commands('ban')
 @priority('high')
 def ban(bot, trigger):
     """
-    This give admins the ability to ban a user.
-    The bot must be a Channel Operator for this command to work.
+    USE: .ban [#channel] banmask
+
+    Command to ban a user from a room.
+
+    Note: Bot must be OP
     """
-    if bot.privileges[trigger.sender][trigger.nick] < OP:
-        return
-    text = trigger.group().split()
-    argc = len(text)
-    if argc < 2:
-        return
-    opt = text[1]
-    banmask = opt
-    channel = trigger.sender
-    if opt.startswith('#'):
-        if argc < 3:
-            return
-        channel = opt
-        banmask = text[2]
-    banmask = configureHostMask(banmask)
-    if banmask == '':
+
+    # If there are no arguments then return the USE statement
+    if len(trigger.group().split()) < 2:
+        bot.say('%s' % cleanDoc(ban))
         return
-    bot.write(['MODE', channel, '+b', banmask])
+
+    setMaskMode(bot, trigger, '+b')
 
 
 @commands('unban')
 def unban(bot, trigger):
     """
-    This give admins the ability to unban a user.
-    The bot must be a Channel Operator for this command to work.
+    USE: .ban [#channel] banmask
+
+    Command to ban a user from a room.
+
+    Note: Bot must be OP
     """
-    if bot.privileges[trigger.sender][trigger.nick] < OP:
-        return
-    text = trigger.group().split()
-    argc = len(text)
-    if argc < 2:
-        return
-    opt = text[1]
-    banmask = opt
-    channel = trigger.sender
-    if opt.startswith('#'):
-        if argc < 3:
-            return
-        channel = opt
-        banmask = text[2]
-    banmask = configureHostMask(banmask)
-    if banmask == '':
+
+    # If there are no arguments then return the USE statement
+    if len(trigger.group().split()) < 2:
+        bot.say('%s' % cleanDoc(unban))
         return
-    bot.write(['MODE', channel, '-b', banmask])
+
+    setMaskMode(bot, trigger, '-b')
 
 
 @commands('quiet')
 def quiet(bot, trigger):
     """
-    This gives admins the ability to quiet a user.
-    The bot must be a Channel Operator for this command to work
+    USE: .quiet [#channel] quietmask
+
+    Command to quiet a user in a room.
+
+    Note: Bot must be OP
     """
-    if bot.privileges[trigger.sender][trigger.nick] < OP:
-        return
-    text = trigger.group().split()
-    argc = len(text)
-    if argc < 2:
-        return
-    opt = text[1]
-    quietmask = opt
-    channel = trigger.sender
-    if opt.startswith('#'):
-        if argc < 3:
-            return
-        quietmask = text[2]
-        channel = opt
-    quietmask = configureHostMask(quietmask)
-    if quietmask == '':
+
+    # If there are no arguments then return the USE statement
+    if len(trigger.group().split()) < 2:
+        bot.say('%s' % cleanDoc(quiet))
         return
-    bot.write(['MODE', channel, '+q', quietmask])
+
+    setMaskMode(bot, trigger, '+q')
 
 
 @commands('unquiet')
 def unquiet(bot, trigger):
     """
-   This gives admins the ability to unquiet a user.
-   The bot must be a Channel Operator for this command to work
-   """
-    if bot.privileges[trigger.sender][trigger.nick] < OP:
-        return
-    text = trigger.group().split()
-    argc = len(text)
-    if argc < 2:
-        return
-    opt = text[1]
-    quietmask = opt
-    channel = trigger.sender
-    if opt.startswith('#'):
-        if argc < 3:
-            return
-        quietmask = text[2]
-        channel = opt
-    quietmask = configureHostMask(quietmask)
-    if quietmask == '':
+    USE: .unquiet [#channel] quietmask
+
+    Command to unquiet a user in a room.
+
+    Note: Bot must be OP
+    """
+
+    # If there are no arguments then return the USE statement
+    if len(trigger.group().split()) < 2:
+        bot.say('%s' % cleanDoc(unquiet))
         return
-    bot.write(['MODE', opt, '-q', quietmask])
+
+    setMaskMode(bot, trigger, '-q')
 
 
 @commands('kickban', 'kb')
 @priority('high')
 def kickban(bot, trigger):
     """
-   This gives admins the ability to kickban a user.
-   The bot must be a Channel Operator for this command to work
-   .kickban [#chan] user1 user!*@* get out of here
-   """
-    if bot.privileges[trigger.sender][trigger.nick] < OP:
+    USE: .kickban|.kb [#channel] nick banmask [reason]
+
+    Command to kick and ban a user from a room.
+
+    Note: Bot must be OP
+    """
+
+    # If there are no arguments then return the USE statement
+    if len(trigger.group().split()) < 2:
+        bot.say('%s' % help)
         return
-    text = trigger.group().split()
-    argc = len(text)
-    if argc < 4:
+
+    args = trigger.group().split()
+    argc = len(args) - 1
+
+    if argc < 2:
+        bot.reply(STRINGS.get('ERROR_MESSAGE_FORMAT') %
+                             (STRINGS.get('ERROR_PREFIX'), e.message))
         return
-    opt = text[1]
-    nick = opt
-    mask = text[2]
-    reasonidx = 3
-    if opt.startswith('#'):
-        if argc < 5:
-            return
-        channel = opt
-        nick = text[2]
-        mask = text[3]
-        reasonidx = 4
-    reason = ' '.join(text[reasonidx:])
-    mask = configureHostMask(mask)
-    if mask == '':
+    elif argc == 2:
+        channel = trigger.sender
+        nick, banmask = args[1:3]
+        reasonidx = 2
+    elif argc > 2:
+        if args[1].startswith('#'):
+            channel, nick, banmask = args[1:4]
+            reasonidx = 4
+        elif args[3].startswith('#'):
+            nick, banmask, channel = args[1:4]
+            reasonidx = 4
+        else:
+            nick, banmask = args[1:3]
+            channel = trigger.sender
+            reasonidx = 3
+
+    reason = ' '.join(args[reasonidx:])
+    if reason == '' or reason is None:
+        reason = DEFAULT_KICK_REASON
+
+    banmask = configureHostMask(banmask)
+
+    if banmask == '':
+        bot.reply(STRINGS.get('ERROR_MESSAGE_FORMAT') %
+                             (STRINGS.get('ERROR_PREFIX'), e.message))
+        return
+
+    if not permissionsCheck(bot, channel, trigger.nick):
+        bot.reply(STRINGS.get('ERROR_MESSAGE_FORMAT') %
+                             (STRINGS.get('ERROR_PREFIX'), e.message))
         return
-    bot.write(['MODE', channel, '+b', mask])
-    bot.write(['KICK', channel, nick, ' :', reason])
+
+    bot.write(['MODE', channel, '+b', banmask])
+    bot.write(['KICK', channel, nick], text=reason)
 
 
 @commands('topic')
 def topic(bot, trigger):
     """
-    This gives ops the ability to change the topic.
+    USE: .topic [#channel] Channel Topic
+
+    Command to change an channel's topic, the Channel Topic can use '~' as a
+    delimiter, showing that there are multiple arguments to be provided for the
+    topic mask to use.
+
+    Note: Bot must be OP
     """
+
+    # If there are no arguments then return the USE statement
+    if len(trigger.group().split()) < 2:
+        bot.say('%s' % cleanDoc(topic))
+        return
+
     purple, green, bold = '\x0306', '\x0310', '\x02'
-    if bot.privileges[trigger.sender][trigger.nick] < OP:
+
+    args = trigger.group().split()
+    argc = len(args) - 1
+
+    if argc < 1:
+        bot.reply(STRINGS.get('ERROR_MESSAGE_FORMAT') %
+                             (STRINGS.get('ERROR_PREFIX'), e.message))
         return
-    text = trigger.group(2)
-    if text == '':
+    elif argc < 2 and args[1].startswith('#'):
+        bot.reply(STRINGS.get('ERROR_MESSAGE_FORMAT') %
+                             (STRINGS.get('ERROR_PREFIX'), e.message))
         return
-    channel = trigger.sender.lower()
+    elif argc > 1:
+        if args[1].startswith('#'):
+            channel = args[1]
+            topicidx = 2
+        else:
+            channel = trigger.sender
+            topicidx = 1
+
+    channel = channel.lower()
+
+    default_mask = purple + 'Welcome to: ' + green + channel + purple \
+        + ' | ' + bold + 'Topic: ' + bold + green + '%s'
 
-    narg = 1
-    mask = None
     if bot.db and channel in bot.db.preferences:
         mask = bot.db.preferences.get(channel, 'topic_mask')
-        narg = len(re.findall('%s', mask))
-    if not mask or mask == '':
-        mask = purple + 'Welcome to: ' + green + channel + purple \
-            + ' | ' + bold + 'Topic: ' + bold + green + '%s'
+    else:
+        mask = default_mask
+
+    nargs = len(re.findall('%s', mask))
+
+    # If the number of '%s' encountered in the mask is 0 or the mask is
+    # empty then we should use the default mask
+    if nargs < 1 or mask is None or mask == '':
+        mask = default_mask
 
-    top = trigger.group(2)
-    text = tuple()
-    if top:
-        text = tuple(unicode.split(top, '~', narg))
+    # Attempt to get a list of arguments. This can be a single string
+    # delimited by '~'
+    new_topic = ' '.join(args[topicidx:])
+    topic_args = tuple(topic.split('~', nargs))
 
-    if len(text) != narg:
-        message = "Not enough arguments. You gave " + str(len(text)) + ', it requires ' + str(narg) + '.'
-        return bot.say(message)
-    topic = mask % text
+    # Make sure we have enough arguments
+    if len(topic_args) < nargs:
+        message = 'Not enough arguments. You gave ' \
+                  + str(len(topic_args)) + ', it requires ' + str(narg) \
+                  + '.'
+        return bot.reply(message)
 
-    bot.write(('TOPIC', channel + ' :' + topic))
+    new_topic = mask % topic_args
+
+    if not permissionsCheck(bot, channel, trigger.nick):
+        bot.reply(STRINGS.get('ERROR_MESSAGE_FORMAT') %
+                             (STRINGS.get('ERROR_PREFIX'), e.message))
+        return
+
+    bot.write(('TOPIC', channel), text=new_topic)
 
 
 @commands('tmask')
 def set_mask(bot, trigger):
     """
-    Set the mask to use for .topic in the current channel. %s is used to allow
-    substituting in chunks of text.
+    USE: .tmask [#channel] Channel Topic
+
+    Command to change an channel's topic mask, the topic mask is used to help
+    format the channel's topic in a uniform manner upon updating. %s is used to
+    allow substituting in chunks of text.
+
+    Note: Bot must be OP
     """
-    if bot.privileges[trigger.sender][trigger.nick] < OP:
+
+    # If there are no arguments then return the USE statement
+    if len(trigger.group().split()) < 2:
+        bot.say('%s' % cleanDoc(set_mask))
+        return
+
+    args = trigger.group().split()
+    argc = len(args) - 1
+
+    if argc < 1:
+        bot.reply(STRINGS.get('ERROR_MESSAGE_FORMAT') %
+                             (STRINGS.get('ERROR_PREFIX'), e.message))
         return
+    elif argc >= 1:
+        if args[1].startswith('#'):
+            channel = args[1].lower()
+            maskidx = 2
+        else:
+            channel = trigger.sender.lower()
+            maskidx = 1
+
+    topic_mask = ' '.join(args[maskidx:])
+
+    if not permissionsCheck(bot, channel, trigger.nick):
+        bot.reply(STRINGS.get('ERROR_MESSAGE_FORMAT') %
+                             (STRINGS.get('ERROR_PREFIX'), e.message))
+        return
+
     if not bot.db:
-        bot.say("I'm afraid I can't do that.")
-    else:
-        bot.db.preferences.update(trigger.sender.lower(), {'topic_mask': trigger.group(2)})
-        bot.say("Gotcha, " + trigger.nick)
+        bot.reply(STRINGS.get('ERROR_MESSAGE_FORMAT') %
+                             (STRINGS.get('ERROR_PREFIX'), e.message))
+        return
+
+    bot.db.preferences.update(channel.lower(), {'topic_mask': topic_mask})
+    bot.reply('Topic mask updated!')
 
 
 @commands('showmask')
 def show_mask(bot, trigger):
-    """Show the topic mask for the current channel."""
-    if bot.privileges[trigger.sender][trigger.nick] < OP:
+    """
+    USE: .showmask [#channel]
+
+    Command to show the topic mask of a given channel.
+
+    Note: Bot must be OP
+    """
+
+    # If there are no arguments then return the USE statement
+    if len(trigger.group().split()) < 2 and not trigger.sender.startswith('#'):
+        bot.say('%s' % cleanDoc(show_mask))
+        return
+
+    args = trigger.group().split()
+    argc = len(args) - 1
+
+    if argc < 1:
+        channel = trigger.sender.lower()
+    elif args[1].startswith('#'):
+        channel = args[1].lower()
+    else:
+        channel = trigger.sender.lower()
+
+    if not permissionsCheck(bot, channel, trigger.nick):
+        bot.reply(STRINGS.get('ERROR_MESSAGE_FORMAT') %
+                             (STRINGS.get('ERROR_PREFIX'), e.message))
         return
+
     if not bot.db:
-        bot.say("I'm afraid I can't do that.")
-    elif trigger.sender.lower() in bot.db.preferences:
-        bot.say(bot.db.preferences.get(trigger.sender.lower(), 'topic_mask'))
+        bot.reply(STRINGS.get('ERROR_MESSAGE_FORMAT') %
+                             (STRINGS.get('ERROR_PREFIX'), e.message))
+        return
+
+    if channel not in bot.db.preferences:
+        bot.reply(STRINGS.get('ERROR_MESSAGE_FORMAT') %
+                             (STRINGS.get('ERROR_PREFIX'), e.message))
+        return
+
+    topic = bot.db.preferences.get(channel, 'topic_mask')
+    bot.reply('The topic mask is:')
+    bot.say('%s' % topic)
+
+
+def configureHostMask(mask):
+    """
+    Allows for short form bans to be used
+
+    nick!user@host.domain
+    """
+    if mask == '*!*@*':
+        return mask
+
+    # Nick
+    if re.match('^[^.@!/]+$', mask) is not None:
+        return '%s!*@*' % mask
+
+    # Host.Domain
+    if re.match('^[^@!]+$', mask) is not None:
+        return '*!*@%s' % mask
+
+    # User@
+    m = re.match('^([^!@]+)@$', mask)
+    if m is not None:
+        return '*!%s@*' % m.group(1)
+
+    # User@Host.Domain
+    m = re.match('^([^!@]+)@([^@!]+)$', mask)
+    if m is not None:
+        return '*!%s@%s' % (m.group(1), m.group(2))
+
+    # Nick!User@
+    m = re.match('^([^!@]+)!([^!@]+)@?$', mask)
+    if m is not None:
+        return '%s!%s@*' % (m.group(1), m.group(2))
+
+    # Nick!User@Host.Domain
+    m = re.match('^([^!@]+)!([^!@]+)@([^!@]+)$', mask)
+    if m is not None:
+        return '%s!%s@%s' % (m.group(1), m.group(2), m.group(3))
+    return ''
+
+
+def permissionsCheck(bot, channel, nick):
+    """
+    Checks to see if the provided user has OP access to the channel
+
+    Returns:
+        False if they do not
+        True if they do
+    """
+    if channel not in bot.privileges or \
+            nick not in bot.privileges[channel] or \
+            bot.privileges[channel][nick] < OP:
+        return False
+    return True
+
+
+def setMaskMode(bot, trigger, mode):
+    """
+    Takes a bot, trigger and mode as arguments and applies
+    the needed mode change on the channel/nick. Used by (un)ban/(un)quiet
+
+    Note: These Require the bot to be OP
+    """
+    args = trigger.group().split()
+    argc = len(args) - 1
+
+    if argc == 1:
+        banmask = args[1]
+        channel = trigger.sender
+    elif argc == 2:
+        if args[1].startswith('#'):
+            channel, banmask = args[1:3]
+        elif args[1].startswith('#'):
+            banmask, channel = args[1:3]
+        else:
+            bot.reply(STRINGS.get('ERROR_MESSAGE_FORMAT') %
+                                 (STRINGS.get('ERROR_PREFIX'), e.message))
+            return
     else:
-        bot.say("%s")
+        bot.reply(STRINGS.get('ERROR_MESSAGE_FORMAT') %
+                             (STRINGS.get('ERROR_PREFIX'), e.message))
+        return
+
+    if not permissionsCheck(bot, channel, trigger.nick):
+        bot.reply(STRINGS.get('ERROR_MESSAGE_FORMAT') %
+                             (STRINGS.get('ERROR_PREFIX'), e.message))
+        return
+
+    banmask = configureHostMask(banmask)
+    if banmask == '':
+        bot.reply(STRINGS.get('ERROR_MESSAGE_FORMAT') %
+                             (STRINGS.get('ERROR_PREFIX'), e.message))
+        return
+
+    bot.write(['MODE', channel, mode, banmask])
+
+
+def setMode(bot, trigger, mode):
+    """
+    Takes a bot, trigger and mode as arguments and applies
+    the needed mode change on the channel/nick. Used by (de)op/(de)voice
+
+    Note: These Require the bot to be OP
+    """
+    args = trigger.group().split()
+    argc = len(args) - 1
+
+    if argc == 0:
+        nick = trigger.nick
+        channel = trigger.sender
+    elif argc == 1:
+        nick = args[1]
+        channel = trigger.sender
+    else:
+        if args[1].startswith('#'):
+            channel, nick = args[1:3]
+        elif args[2].startswith('#'):
+            nick, channel = args[1:3]
+        else:
+            bot.reply(STRINGS.get('ERROR_MESSAGE_FORMAT') %
+                                 (STRINGS.get('ERROR_PREFIX'), e.message))
+            return
+
+    if not permissionsCheck(bot, channel, trigger.nick):
+        bot.reply(STRINGS.get('ERROR_MESSAGE_FORMAT') %
+                             (STRINGS.get('ERROR_PREFIX'), e.message))
+        return
+
+    bot.write(['MODE', channel, mode, nick])
+
+
+def cleanDoc(doc):
+    """
+    Try to find the first newline and truncate, we skip the first two
+    lines to avoid docs that start with \r\n
+    """
+    for line in doc.__doc__.replace('\r', '').split('\n'):
+        if line != '':
+            return line