diff --git a/slapos/bang.py b/slapos/bang.py
index c7cb7622371cc17f97aea7ed881c02728cf1c757..a9a6d50766f4cf919da6b238c0e4f2c749ef32c0 100644
--- a/slapos/bang.py
+++ b/slapos/bang.py
@@ -28,10 +28,11 @@
 #
 ##############################################################################
 
-import slapos.slap.slap
 import argparse
 import ConfigParser
 
+import slapos.slap.slap
+
 
 def do_bang(config, message):
   computer_id = config.get('slapos', 'computer_id')
diff --git a/slapos/cli/config.py b/slapos/cli/config.py
index 0f3b6e6e4602dbf674a86c18abf7f67c43001988..7e397f402a29aded1682b53613ff13fa2f104276 100644
--- a/slapos/cli/config.py
+++ b/slapos/cli/config.py
@@ -12,8 +12,6 @@ class ConfigError(Exception):
 
 class ConfigCommand(Command):
     "Base class for commands that require a configuration file"
-    # TODO: what commands need slapos.cfg / slapos_client.cfg?
-    # XXX: always use SafeConfigParser, or sometimes RawConfigParser?
 
     log = None