diff --git a/workflow/engine/classes/CLI.php b/workflow/engine/classes/CLI.php
index 1a973f86b..a44826718 100644
--- a/workflow/engine/classes/CLI.php
+++ b/workflow/engine/classes/CLI.php
@@ -1,41 +1,10 @@
 <?php
 
-/**
- * class.cli.php
- *
- * @package workflow.engine.classes
- *
- * ProcessMaker Open Source Edition
- * Copyright (C) 2011 Colosa Inc.
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- *
- * For more information, contact Colosa Inc, 2566 Le Jeune Rd.,
- * Coral Gables, FL, 33134, USA, or email info@colosa.com.
- *
- * @author Alexandre Rosenfeld <alexandre@colosa.com>
- */
-
 /**
  *
  * @package workflow.engine.classes
  */
-
-/**
- *
- * @package workflow.engine.classes
- */class CLI
+class CLI
 {
     public static $tasks = array ();
     public static $currentTask = null;
diff --git a/workflow/engine/classes/DynaformEditor.php b/workflow/engine/classes/DynaformEditor.php
index 983b04b1b..fe07fa8d5 100644
--- a/workflow/engine/classes/DynaformEditor.php
+++ b/workflow/engine/classes/DynaformEditor.php
@@ -6,7 +6,8 @@
 /**
  *
  * @package workflow.engine.classes
- */class DynaformEditor extends WebResource
+ */
+class DynaformEditor extends WebResource
 {
 
     private $isOldCopy = false;
diff --git a/workflow/engine/classes/DynaformEditorAjax.php b/workflow/engine/classes/DynaformEditorAjax.php
index a27f73dbb..bfd5fa042 100644
--- a/workflow/engine/classes/DynaformEditorAjax.php
+++ b/workflow/engine/classes/DynaformEditorAjax.php
@@ -7,7 +7,8 @@
  * DynaformEditorAjax - DynaformEditorAjax class
  *
  * @package workflow.engine.classes
- */class DynaformEditorAjax extends DynaformEditor implements IDynaformEditorAjax
+ */
+class DynaformEditorAjax extends DynaformEditor implements IDynaformEditorAjax
 {
 
     /**
diff --git a/workflow/engine/classes/JavaBridgePM.php b/workflow/engine/classes/JavaBridgePM.php
index 8dc58c7c8..ca64882ce 100644
--- a/workflow/engine/classes/JavaBridgePM.php
+++ b/workflow/engine/classes/JavaBridgePM.php
@@ -1,28 +1,4 @@
 <?php
-/**
- * class.javaBridgePM.php
- *
- * @package workflow.engine.classes
- *
- * ProcessMaker Open Source Edition
- * Copyright (C) 2004 - 2011 Colosa Inc.
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- *
- * For more information, contact Colosa Inc, 2566 Le Jeune Rd.,
- * Coral Gables, FL, 33134, USA, or email info@colosa.com.
- */
 
 if (! defined( 'JAVA_BRIDGE_PATH' )) {
     define( 'JAVA_BRIDGE_PATH', 'JavaBridgePM' );
@@ -39,10 +15,7 @@ if (! defined( 'JAVA_BRIDGE_HOST' )) {
  * @package workflow.engine.classes
  */
 
-/**
- *
- * @package workflow.engine.classes
- */class JavaBridgePM
+class JavaBridgePM
 {
     public $JavaBridgeDir = JAVA_BRIDGE_PATH;
     public $JavaBridgePort = JAVA_BRIDGE_PORT;
diff --git a/workflow/engine/classes/PluginDetail.php b/workflow/engine/classes/PluginDetail.php
index 2de918444..e815fadea 100644
--- a/workflow/engine/classes/PluginDetail.php
+++ b/workflow/engine/classes/PluginDetail.php
@@ -1,17 +1,13 @@
 <?php
 
-/**
- *
- * @package workflow.engine.classes
- */
-
 //@todo: Pending until class.plugin.php is solved.
 require_once 'class.plugin.php';
 
 /**
  *
  * @package workflow.engine.classes
- */class PluginDetail
+ */
+class PluginDetail
 {
     public $sNamespace;
     public $sClassName;
diff --git a/workflow/engine/classes/PmGoogleApi.php b/workflow/engine/classes/PmGoogleApi.php
index e8e16433d..b5c018ef2 100644
--- a/workflow/engine/classes/PmGoogleApi.php
+++ b/workflow/engine/classes/PmGoogleApi.php
@@ -7,11 +7,7 @@
 
 require_once PATH_TRUNK . 'vendor' . PATH_SEP . 'google' . PATH_SEP . 'apiclient' . PATH_SEP . 'src' . PATH_SEP . 'Google' . PATH_SEP . 'autoload.php';
 
-
-/**
- * class.pmGoogleApi.php
- *
- */class PmGoogleApi
+class PmGoogleApi
 {
     const DRIVE = 'https://www.googleapis.com/auth/drive';
     const DRIVE_FILE = 'https://www.googleapis.com/auth/drive.file';
diff --git a/workflow/engine/classes/PmLicenseManager.php b/workflow/engine/classes/PmLicenseManager.php
index 91178cc8a..fd1aff4b6 100644
--- a/workflow/engine/classes/PmLicenseManager.php
+++ b/workflow/engine/classes/PmLicenseManager.php
@@ -8,10 +8,7 @@ use ProcessMaker\Plugins\PluginRegistry;
  *
  */
 
-/**
- * class.pmLicenseManager.php
- *
- */class PmLicenseManager
+class PmLicenseManager
 {
 
     private static $instance = null;