diff --git a/bin/gva b/bin/gva
index 4856b53..80f9f5d 100755
--- a/bin/gva
+++ b/bin/gva
@@ -22,7 +22,7 @@
 # Version: $Id$
 
 from sys import argv
-from gnuviechadmin.config import config
+from gnuviechadmin.config import CONFIG
 from gnuviechadmin.cli import CommandLineInterface
 
-CommandLineInterface(config, argv).run()
+CommandLineInterface(CONFIG, argv).run()
diff --git a/data/dbrepo/versions/002.py b/data/dbrepo/versions/002.py
index 043c65c..275069e 100644
--- a/data/dbrepo/versions/002.py
+++ b/data/dbrepo/versions/002.py
@@ -1,10 +1,10 @@
 from sqlalchemy import *
 from migrate import *
-from gnuviechadmin.config import config
+from gnuviechadmin.config import CONFIG
 
 dbschema = None
-if 'database.schema' in config:
-    dbschema = config['database.schema']
+if 'database.schema' in CONFIG:
+    dbschema = CONFIG['database.schema']
 
 meta = MetaData(migrate_engine)
 client = Table(
diff --git a/data/dbrepo/versions/003.py b/data/dbrepo/versions/003.py
index cff60c6..ad688bc 100644
--- a/data/dbrepo/versions/003.py
+++ b/data/dbrepo/versions/003.py
@@ -1,10 +1,10 @@
 from sqlalchemy import *
 from migrate import *
-from gnuviechadmin.config import config
+from gnuviechadmin.config import CONFIG
 
 dbschema = None
-if 'database.schema' in config:
-    dbschema = config['database.schema']
+if 'database.schema' in CONFIG:
+    dbschema = CONFIG['database.schema']
 
 meta = MetaData(migrate_engine)
 domain = Table('domain', meta, schema = dbschema, autoload = True)
diff --git a/data/dbrepo/versions/004_Add_organization_table.py b/data/dbrepo/versions/004_Add_organization_table.py
index 277abbe..ce22bd0 100644
--- a/data/dbrepo/versions/004_Add_organization_table.py
+++ b/data/dbrepo/versions/004_Add_organization_table.py
@@ -1,11 +1,11 @@
 from sqlalchemy import MetaData, Table, Column, Integer, Unicode, ForeignKey
 from migrate import migrate_engine
 from migrate.changeset.schema import create_column
-from gnuviechadmin.config import config
+from gnuviechadmin.config import CONFIG
 
 dbschema = None
-if 'database.schema' in config:
-    dbschema = config['database.schema']
+if 'database.schema' in CONFIG:
+    dbschema = CONFIG['database.schema']
 
 meta = MetaData(migrate_engine)
 client = Table('client', meta, schema = dbschema, autoload = True)
diff --git a/gnuviechadmin/backend/BackendEntityHandler.py b/gnuviechadmin/backend/BackendEntityHandler.py
index c247c21..3a87664 100644
--- a/gnuviechadmin/backend/BackendEntityHandler.py
+++ b/gnuviechadmin/backend/BackendEntityHandler.py
@@ -21,7 +21,7 @@
 """This module defines the BackendEntityHandler class."""
 
 import logging
-from sqlalchemy.orm import create_session, mapper, relation
+from sqlalchemy.orm import create_session
 from gnuviechadmin.backend.tables import dbsetup
 
 
diff --git a/gnuviechadmin/config.py b/gnuviechadmin/config.py
index 8738dc9..897a9d7 100644
--- a/gnuviechadmin/config.py
+++ b/gnuviechadmin/config.py
@@ -20,6 +20,9 @@
 # USA.
 #
 # Version: $Id$
+"""
+Parse the configuration and setup logging.
+"""
 
 from sys import argv
 from os import getcwd
@@ -28,10 +31,10 @@ from paste.deploy import appconfig
 from logging.config import fileConfig
 
 if len(argv) > 1 and isfile(argv[1]):
-    configfile = argv[1]
+    CONFIGFILE = argv[1]
     del argv[1]
 else:
-    configfile = 'development.ini'
+    CONFIGFILE = 'development.ini'
 
-config = appconfig('config:%s' % configfile, relative_to=getcwd())
-fileConfig(configfile, config)
+CONFIG = appconfig('config:%s' % CONFIGFILE, relative_to=getcwd())
+fileConfig(CONFIGFILE, CONFIG)