diff --git a/src/collectors/conntrack/conntrack.py b/src/collectors/conntrack/conntrack.py
index ffe3568f6..7f6b930d4 100644
--- a/src/collectors/conntrack/conntrack.py
+++ b/src/collectors/conntrack/conntrack.py
@@ -1,12 +1,10 @@
-
-from diamond import *
 import diamond.collector
 import subprocess
 import os
+import re
 
 _RE = re.compile(r'^([a-z\._]*) = ([0-9]*)$')
 
-
 class ConnTrackCollector(diamond.collector.Collector):
     """
     Shells out to get the value of sysctl net.netfilter.nf_conntrack_count
diff --git a/src/collectors/cpu/cpu.py b/src/collectors/cpu/cpu.py
index 38ea05515..8b632de4d 100644
--- a/src/collectors/cpu/cpu.py
+++ b/src/collectors/cpu/cpu.py
@@ -1,6 +1,5 @@
-
-from diamond import *
 import diamond.collector
+import os
 
 try:
     import psutil
diff --git a/src/collectors/diskspace/diskspace.py b/src/collectors/diskspace/diskspace.py
index 9c0622d96..090315f16 100644
--- a/src/collectors/diskspace/diskspace.py
+++ b/src/collectors/diskspace/diskspace.py
@@ -1,8 +1,7 @@
-
-from diamond import *
 import diamond.collector
 import diamond.convertor
 import os
+import re
 
 try:
     import psutil
diff --git a/src/collectors/diskusage/diskusage.py b/src/collectors/diskusage/diskusage.py
index e66aea471..3fa860a01 100644
--- a/src/collectors/diskusage/diskusage.py
+++ b/src/collectors/diskusage/diskusage.py
@@ -1,11 +1,8 @@
-
-# http://www.kernel.org/doc/Documentation/iostats.txt
-
-from diamond import *
 import diamond.collector
 import diamond.convertor
 import time
 import os
+import re
 
 try:
     import psutil
@@ -15,6 +12,9 @@
 class DiskUsageCollector(diamond.collector.Collector):
     """
     Collect IO Stats
+    
+     * http://www.kernel.org/doc/Documentation/iostats.txt
+     
     """
     MAX_VALUES = {
         'reads':                    4294967295,
diff --git a/src/collectors/example/example.py b/src/collectors/example/example.py
index c5f1cfda2..27290f0c1 100644
--- a/src/collectors/example/example.py
+++ b/src/collectors/example/example.py
@@ -1,4 +1,3 @@
-
 import diamond.collector
 
 class ExampleCollector(diamond.collector.Collector):
diff --git a/src/collectors/exim/exim.py b/src/collectors/exim/exim.py
index 5a58f99eb..e6e434d85 100644
--- a/src/collectors/exim/exim.py
+++ b/src/collectors/exim/exim.py
@@ -1,4 +1,3 @@
-from diamond import *
 import diamond.collector
 import subprocess
 import os
diff --git a/src/collectors/filestat/filestat.py b/src/collectors/filestat/filestat.py
index eb4609e33..2dbdaa961 100644
--- a/src/collectors/filestat/filestat.py
+++ b/src/collectors/filestat/filestat.py
@@ -1,6 +1,6 @@
-
-from diamond import *
 import diamond.collector
+import re
+import os
 
 _RE = re.compile(r'(\d+)\s+(\d+)\s+(\d+)')
 
diff --git a/src/collectors/hadoop/hadoop.py b/src/collectors/hadoop/hadoop.py
index 9ff3e098b..474187ef5 100644
--- a/src/collectors/hadoop/hadoop.py
+++ b/src/collectors/hadoop/hadoop.py
@@ -1,17 +1,15 @@
-#
-# Diamond collector for Hadoop metrics, see:
-#
-#  * http://www.cloudera.com/blog/2009/03/hadoop-metrics/
-
-from diamond import *
 from diamond.metric import Metric
 import diamond.collector
 import glob
 import re
+import os
 
 class HadoopCollector(diamond.collector.Collector):
     """
-    Processes Hadoop metrics.
+    Diamond collector for Hadoop metrics, see:
+    
+    * http://www.cloudera.com/blog/2009/03/hadoop-metrics/
+    
     """
 
     re_log = re.compile(r'^(?P<timestamp>\d+) (?P<name>\S+): (?P<metrics>.*)$')
diff --git a/src/collectors/haproxy/haproxy.py b/src/collectors/haproxy/haproxy.py
index 4f97249df..564add117 100644
--- a/src/collectors/haproxy/haproxy.py
+++ b/src/collectors/haproxy/haproxy.py
@@ -1,4 +1,3 @@
-
 import re
 import sys
 import urllib2
@@ -6,7 +5,6 @@
 import csv
 import logging
 from urlparse import urlparse
-
 import diamond.collector
 
 class HAProxyCollector(diamond.collector.Collector):
diff --git a/src/collectors/httpd/httpd.py b/src/collectors/httpd/httpd.py
index 098a55688..e8a2e0fc3 100644
--- a/src/collectors/httpd/httpd.py
+++ b/src/collectors/httpd/httpd.py
@@ -1,10 +1,8 @@
-
 import os
 import sys
 import re
 import httplib
 import urlparse
-
 import diamond.collector
 
 class HttpdCollector(diamond.collector.Collector):
diff --git a/src/collectors/interrupt/interrupt.py b/src/collectors/interrupt/interrupt.py
index 52f074d06..cacce955f 100644
--- a/src/collectors/interrupt/interrupt.py
+++ b/src/collectors/interrupt/interrupt.py
@@ -1,7 +1,5 @@
-
 import platform
 import os
-
 import diamond.collector
 
 # Detect the architecture of the system
diff --git a/src/collectors/kvm/kvm.py b/src/collectors/kvm/kvm.py
index 6029ec1f7..d8b55cb2c 100644
--- a/src/collectors/kvm/kvm.py
+++ b/src/collectors/kvm/kvm.py
@@ -1,5 +1,3 @@
-
-from diamond import *
 import diamond.collector
 import os
 
diff --git a/src/collectors/loadavg/loadavg.py b/src/collectors/loadavg/loadavg.py
index b17a9747d..3bfeb0520 100644
--- a/src/collectors/loadavg/loadavg.py
+++ b/src/collectors/loadavg/loadavg.py
@@ -1,6 +1,6 @@
-
-from diamond import *
 import diamond.collector
+import re
+import os
 
 _RE = re.compile(r'([\d.]+) ([\d.]+) ([\d.]+) (\d+)/(\d+)')
 
diff --git a/src/collectors/memcached/memcached.py b/src/collectors/memcached/memcached.py
index 4c55f3804..ab9deecad 100644
--- a/src/collectors/memcached/memcached.py
+++ b/src/collectors/memcached/memcached.py
@@ -1,6 +1,4 @@
-
 import subprocess
-
 import diamond.collector
 import socket
 
diff --git a/src/collectors/memory/memory.py b/src/collectors/memory/memory.py
index 24419c1b4..788b15216 100644
--- a/src/collectors/memory/memory.py
+++ b/src/collectors/memory/memory.py
@@ -1,7 +1,6 @@
-
-from diamond import *
 import diamond.collector
 import diamond.convertor
+import os
 
 try:
     import psutil
diff --git a/src/collectors/mongodb/mongodb.py b/src/collectors/mongodb/mongodb.py
index 51dae3248..3963c44ae 100644
--- a/src/collectors/mongodb/mongodb.py
+++ b/src/collectors/mongodb/mongodb.py
@@ -1,3 +1,5 @@
+import diamond.collector
+
 try:
     from numbers import Number
     import pymongo
@@ -5,9 +7,6 @@
 except ImportError:
     Number = None
 
-import diamond
-
-
 class MongoDBCollector(diamond.collector.Collector):
     """Collects data from MongoDB's db.serverStatus() command
 
diff --git a/src/collectors/mysql/mysql.py b/src/collectors/mysql/mysql.py
index da23f5beb..a9bb8ecbc 100644
--- a/src/collectors/mysql/mysql.py
+++ b/src/collectors/mysql/mysql.py
@@ -1,11 +1,12 @@
+import diamond.collector
+import re
+import time
+
 try:
     import MySQLdb
     from MySQLdb import MySQLError
 except ImportError:
     MySQLdb = None
-import diamond
-import re
-import time
 
 class MySQLCollector(diamond.collector.Collector):
 
diff --git a/src/collectors/network/network.py b/src/collectors/network/network.py
index c64218cb9..60e6d3ab7 100644
--- a/src/collectors/network/network.py
+++ b/src/collectors/network/network.py
@@ -1,7 +1,7 @@
-
-from diamond import *
 import diamond.collector
 import diamond.convertor
+import os
+import re
 
 try:
     import psutil
diff --git a/src/collectors/nfsd/nfsd.py b/src/collectors/nfsd/nfsd.py
index da1b9da03..9cf491d70 100644
--- a/src/collectors/nfsd/nfsd.py
+++ b/src/collectors/nfsd/nfsd.py
@@ -1,6 +1,5 @@
-
-from diamond import *
 import diamond.collector
+import os
 
 class NfsdCollector(diamond.collector.Collector):
     """
diff --git a/src/collectors/nginx/nginx.py b/src/collectors/nginx/nginx.py
index 208cd14c6..c4db4d17d 100644
--- a/src/collectors/nginx/nginx.py
+++ b/src/collectors/nginx/nginx.py
@@ -1,6 +1,5 @@
 import urllib2
 import re
-
 import diamond.collector
 
 class NginxCollector(diamond.collector.Collector):
diff --git a/src/collectors/onewire/onewire.py b/src/collectors/onewire/onewire.py
index db25b149a..84de42497 100644
--- a/src/collectors/onewire/onewire.py
+++ b/src/collectors/onewire/onewire.py
@@ -1,8 +1,6 @@
-
 import os
 import diamond.collector
 
-
 class OneWireCollector(diamond.collector.Collector):
     """
     The OneWireCollector collects data from 1-Wire Filesystem
diff --git a/src/collectors/openvpn/openvpn.py b/src/collectors/openvpn/openvpn.py
index 5927e79c2..f66cc18bf 100644
--- a/src/collectors/openvpn/openvpn.py
+++ b/src/collectors/openvpn/openvpn.py
@@ -1,7 +1,3 @@
-#
-# Diamond collector for OpenVPN metrics
-
-from diamond import *
 from diamond.metric import Metric
 import diamond.collector
 import os.path
diff --git a/src/collectors/ping/ping.py b/src/collectors/ping/ping.py
index d537da55c..9aab4cf09 100644
--- a/src/collectors/ping/ping.py
+++ b/src/collectors/ping/ping.py
@@ -1,6 +1,4 @@
-
 import subprocess
-
 import diamond.collector
 
 class PingCollector(diamond.collector.Collector):
diff --git a/src/collectors/postqueue/postqueue.py b/src/collectors/postqueue/postqueue.py
index dbef43b76..bd35a815d 100644
--- a/src/collectors/postqueue/postqueue.py
+++ b/src/collectors/postqueue/postqueue.py
@@ -1,6 +1,4 @@
-
 import subprocess
-
 import diamond.collector
 
 class PostqueueCollector(diamond.collector.Collector):
diff --git a/src/collectors/rabbitmq/rabbitmq.py b/src/collectors/rabbitmq/rabbitmq.py
index 17433da8f..e5ac6a4a0 100644
--- a/src/collectors/rabbitmq/rabbitmq.py
+++ b/src/collectors/rabbitmq/rabbitmq.py
@@ -1,11 +1,10 @@
+import diamond.collector
+
 try:
     from numbers import Number
     import pyrabbit.api
 except ImportError:
     Number = None
-import diamond
-
-from pprint import pprint
 
 class RabbitMQCollector(diamond.collector.Collector):
     """Collects data from RabbitMQ through the admin interface
diff --git a/src/collectors/redisstat/redisstat.py b/src/collectors/redisstat/redisstat.py
index a4c4b7978..66f90edc8 100644
--- a/src/collectors/redisstat/redisstat.py
+++ b/src/collectors/redisstat/redisstat.py
@@ -1,5 +1,6 @@
 import diamond.collector
 import time
+
 try:
     import redis
 except ImportError:
diff --git a/src/collectors/snmp/snmp.py b/src/collectors/snmp/snmp.py
index da679e70b..3ef3398d5 100644
--- a/src/collectors/snmp/snmp.py
+++ b/src/collectors/snmp/snmp.py
@@ -1,4 +1,3 @@
-
 import os
 import sys
 import string
diff --git a/src/collectors/snmpinterface/snmpinterface.py b/src/collectors/snmpinterface/snmpinterface.py
index 40dda690d..a824cfe05 100644
--- a/src/collectors/snmpinterface/snmpinterface.py
+++ b/src/collectors/snmpinterface/snmpinterface.py
@@ -1,4 +1,3 @@
-
 import os
 import sys
 import string
diff --git a/src/collectors/sockstat/sockstat.py b/src/collectors/sockstat/sockstat.py
index 4e6101e72..4c250e953 100644
--- a/src/collectors/sockstat/sockstat.py
+++ b/src/collectors/sockstat/sockstat.py
@@ -1,6 +1,6 @@
-
-from diamond import *
 import diamond.collector
+import re
+import os
 
 _RE = re.compile('|'.join([
     r'sockets: used (?P<used>\d+)',
diff --git a/src/collectors/tcp/tcp.py b/src/collectors/tcp/tcp.py
index 0b2e402cf..be83c59c6 100644
--- a/src/collectors/tcp/tcp.py
+++ b/src/collectors/tcp/tcp.py
@@ -1,6 +1,5 @@
-
-from diamond import *
 import diamond.collector
+import os
 
 class TCPCollector(diamond.collector.Collector):
     """
diff --git a/src/collectors/ups/ups.py b/src/collectors/ups/ups.py
index abe085e8e..61bb42b81 100644
--- a/src/collectors/ups/ups.py
+++ b/src/collectors/ups/ups.py
@@ -1,6 +1,5 @@
-from diamond import *
 import diamond.collector
-
+import os
 import subprocess
 
 class UPSCollector(diamond.collector.Collector):
diff --git a/src/collectors/userscripts/userscripts.py b/src/collectors/userscripts/userscripts.py
index 11549885a..8cedbde96 100644
--- a/src/collectors/userscripts/userscripts.py
+++ b/src/collectors/userscripts/userscripts.py
@@ -1,8 +1,6 @@
-
-from diamond import *
 import diamond.collector
 import diamond.convertor
-
+import os
 import commands
 
 class UserScriptsCollector(diamond.collector.Collector):
diff --git a/src/collectors/varnish/varnish.py b/src/collectors/varnish/varnish.py
index 590a5d0c8..5ef8c174e 100644
--- a/src/collectors/varnish/varnish.py
+++ b/src/collectors/varnish/varnish.py
@@ -1,5 +1,3 @@
-
-from diamond import *
 import diamond.collector
 import re
 import subprocess
diff --git a/src/collectors/vmstat/vmstat.py b/src/collectors/vmstat/vmstat.py
index c17d2b56d..9cde331ad 100644
--- a/src/collectors/vmstat/vmstat.py
+++ b/src/collectors/vmstat/vmstat.py
@@ -1,6 +1,6 @@
-
-from diamond import *
 import diamond.collector
+import os
+import re
 
 class VMStatCollector(diamond.collector.Collector):
     """