diff --git a/setup/lib/cli.py b/setup/lib/cli.py
index e6f15833..07807c61 100755
--- a/setup/lib/cli.py
+++ b/setup/lib/cli.py
@@ -9,7 +9,7 @@ from functions import DatenpolFunctions
 
 def main():
     def _usage():
-        print '\nVerwendung: dp <environment> <command> [<module_name>/<setup_function>]'
+        print 'Verwendung: dp <environment> <command> [<module_name>/<setup_function>]'
         print '            dp list-envs\n'
         print 'Commands:'
         print '   create                     Neue Datenbank erstellen'
@@ -185,8 +185,8 @@ def main():
         ]
 
     if cmd == 'setup_part':
-        if (argv[2] == 'info') or (not (argv[2] in setup_methods)):
-            print '\nVerfügbare Setup-Schritte: ' + str(setup_methods) + '\n'
+        if (argv[2] == 'info') or (argv[2] not in setup_methods):
+            print 'Verfügbare Setup-Schritte:', ', '.join(setup_methods)
             return
 
         methods = [