diff --git a/src/lib/config/ccsession.cc b/src/lib/config/ccsession.cc
index 4cce44b9bf9109e9cd1f1503119a9de23609ca2c..0d966a4517e026daa119227f2e303192f5d729c6 100644
--- a/src/lib/config/ccsession.cc
+++ b/src/lib/config/ccsession.cc
@@ -315,18 +315,23 @@ ModuleCCSession::checkCommand() {
                 if (target_module == module_name_) {
                     if (command_handler_) {
                         ElementPtr errors = Element::createList();
-                        if (module_specification_.validate_command(cmd_str, arg, errors)) {
+                        if (module_specification_.validate_command(cmd_str,
+                                                                   arg,
+                                                                   errors)) {
                             answer = command_handler_(cmd_str, arg);
                         } else {
                             std::stringstream ss;
                             ss << "Error in command validation: ";
-                            BOOST_FOREACH(ConstElementPtr error, errors->listValue()) {
+                            BOOST_FOREACH(ConstElementPtr error,
+                                          errors->listValue()) {
                                 ss << error->stringValue();
                             }
                             answer = createAnswer(3, ss.str());
                         }
                     } else {
-                        answer = createAnswer(1, "Command given but no command handler for module");
+                        answer = createAnswer(1,
+                                              "Command given but no "
+                                              "command handler for module");
                     }
                 }
             }
diff --git a/src/lib/config/module_spec.cc b/src/lib/config/module_spec.cc
index 05edd62adb9a4828b04d6d610d8b06d46b9139b3..ba456e8f20c315aaf216ef6661f080a6b02927d7 100644
--- a/src/lib/config/module_spec.cc
+++ b/src/lib/config/module_spec.cc
@@ -190,7 +190,8 @@ ModuleSpec::validate_command(const std::string& command,
     ConstElementPtr commands_spec = module_specification->find("commands");
 
     if (args->getType() != Element::map) {
-        errors->add(Element::create("args for command " + command + " is not a map"));
+        errors->add(Element::create("args for command " +
+                                    command + " is not a map"));
         return (false);
     }
 
@@ -202,7 +203,8 @@ ModuleSpec::validate_command(const std::string& command,
 
     BOOST_FOREACH(ConstElementPtr cur_command, commands_spec->listValue()) {
         if (cur_command->get("command_name")->stringValue() == command) {
-            return (validate_spec_list(cur_command->get("command_args"), args, true, errors));
+            return (validate_spec_list(cur_command->get("command_args"),
+                                       args, true, errors));
         }
     }