diff --git a/src/callbacks.py b/src/callbacks.py
index a8366ead6..81700bced 100644
--- a/src/callbacks.py
+++ b/src/callbacks.py
@@ -292,8 +292,8 @@ class Tokenizer(object):
     def _handleToken(self, token):
         if token[0] == token[-1] and token[0] in self.quotes:
             token = token[1:-1]
-            # FIXME: No need to tell you this is a hack.
-            # It has to handle both IRC commands and serialized configuration.
+            # FIXME: No need to tell you this is a hack.
+            # It has to handle both IRC commands and serialized configuration.
             #
             # Whoever you are, if you make a single modification to this
             # code, TEST the code with Python 2 & 3, both with the unit
diff --git a/src/ircmsgs.py b/src/ircmsgs.py
index 09759d950..1d355501c 100644
--- a/src/ircmsgs.py
+++ b/src/ircmsgs.py
@@ -196,9 +196,11 @@ class IrcMsg(object):
         return (self.__class__, (str(self),))
 
     def tag(self, tag, value=True):
+        """Affect a key:value pair to this message."""
         self.tags[tag] = value
 
     def tagged(self, tag):
+        """Get the value affected to a tag."""
         return self.tags.get(tag) # Returns None if it's not there.
 
     def __getattr__(self, attr):