diff --git a/terminatorlib/config.py b/terminatorlib/config.py
index 0f955d0f..1cff5eac 100755
--- a/terminatorlib/config.py
+++ b/terminatorlib/config.py
@@ -41,17 +41,20 @@ import pwd
 debug = False
 
 def dbg (log = ""):
+  """Print a message if debugging is enabled"""
   if debug:
     print >> sys.stderr, log
 
 def err (log = ""):
+  """Print an error message"""
   print >> sys.stderr, log
 
 class TerminatorConfig:
+  """This class is used as the base point of the config system"""
   callback = None
   sources = []
 
-  def __init__ (self, sources = []):
+  def __init__ (self, sources):
     for source in sources:
       if isinstance(source, TerminatorConfValuestore):
         self.sources.append (source)
diff --git a/terminatorlib/encoding.py b/terminatorlib/encoding.py
index 014795cb..3f33f1a4 100644
--- a/terminatorlib/encoding.py
+++ b/terminatorlib/encoding.py
@@ -24,7 +24,7 @@ This list is taken from gnome-terminal's src/encoding.h
 """
 
 class TerminatorEncoding:
-  
+  """Class to store encoding details"""
   encodings = [
     [True, None, _("Current Locale")],
     [False, "ISO-8859-1", _("Western")],
@@ -103,6 +103,7 @@ class TerminatorEncoding:
   ]
 
   def get_list():
+    """Return a list of supported encodings"""
     return TerminatorEncoding.encodings
   get_list = staticmethod(get_list)
 
diff --git a/terminatorlib/version.py b/terminatorlib/version.py
index 00684421..3621ba92 100644
--- a/terminatorlib/version.py
+++ b/terminatorlib/version.py
@@ -20,5 +20,5 @@
 TerminatorVersion supplies our version number.
 """
 
-APP_NAME='terminator'
-APP_VERSION='0.9'
+APP_NAME = 'terminator'
+APP_VERSION = '0.9'