diff --git a/include/class_ldapFilter.inc b/include/class_ldapFilter.inc
index 318413b37dea789860a40df3ab9eee3caaba15cd..7169f08ae7cf58510af20979de8a6f1ac02ff099 100644
--- a/include/class_ldapFilter.inc
+++ b/include/class_ldapFilter.inc
@@ -89,7 +89,8 @@ class ldapFilter
 
     if (in_array($filter[0], ldapFilter::$operators)) {
       $subfilters = array();
-      $filter .= ')'; // We need an ending parenthesis in order to catch last subpart correctly
+      /* We need an ending parenthesis in order to catch last subpart correctly */
+      $filter .= ')';
       $offset = 0;
       $level  = 0;
       $open;
diff --git a/include/class_listing.inc b/include/class_listing.inc
index 71d46c5257cfa7dfd035a4e22214716463c464a9..7dcc85c4e00c2dbc014d06b57bc90ca9eaa95479 100644
--- a/include/class_listing.inc
+++ b/include/class_listing.inc
@@ -1576,7 +1576,8 @@ class listing
     foreach ($types as $type) {
       $i = objects::infos($type);
       $filter .= $i['filter'];
-      $attrs[] = $i['mainAttr']; // Specific key for departement objectTypes
+      // Specific key for departement objectTypes
+      $attrs[] = $i['mainAttr'];
     }
     $filter .= ")";
     $res = get_list($filter, $this->categories, $this->base, $attrs, GL_NONE);
diff --git a/include/class_logging.inc b/include/class_logging.inc
index 1656b9ea70295ed4959e4bff6306cc90b2182e59..fb6e0e8caa93bc4acaf1ae4cbda4c53b37476bd3 100644
--- a/include/class_logging.inc
+++ b/include/class_logging.inc
@@ -134,7 +134,8 @@ class logging {
   {
     global $config;
     if ($entry['objecttype'] == 'plugin/auditEvent') {
-      return; // Avoid infinite loop
+      // Avoid infinite loop
+      return;
     }
     $tabObject = objects::create('auditEvent');
     $baseObject = $tabObject->getBaseObject();
diff --git a/include/class_management.inc b/include/class_management.inc
index 2c68b4825742fe121e36470312fe1a86cf644f83..f7dbd83408eabc2871b1fc8d08dc1cdfcb4e5f64 100644
--- a/include/class_management.inc
+++ b/include/class_management.inc
@@ -37,7 +37,8 @@ class management
   public $plHeadline    = "unconfigured";
 
   // The currently used object(s) (e.g. in edit, removal)
-  public $dn      = "";  // this is public due to some compatibility problems with class plugin..
+  // this is public due to some compatibility problems with class plugin..
+  public $dn      = "";
   protected $dns  = array();
 
   // The last used object(s).
@@ -48,11 +49,16 @@ class management
   protected $storagePoints = array();
 
   // The tab definitions to use for the current object.
-  protected $tabClass     = "";      // e.g. usertabs
-  protected $tabType      = "";      // e.g. USERTABS
-  protected $aclPlugin    = "";      // e.g. generic
-  protected $aclCategory  = "";      // e.g. user
-  protected $objectName   = "";      // e.g. users
+  // e.g. usertabs
+  protected $tabClass     = "";
+  // e.g. USERTABS
+  protected $tabType      = "";
+  // e.g. generic
+  protected $aclPlugin    = "";
+  // e.g. user
+  protected $aclCategory  = "";
+  // e.g. users
+  protected $objectName   = "";
 
   // The opened object.
   protected $tabObject    = NULL;