diff --git a/app/app_controller.php b/app/app_controller.php
index c7838e480..5329c4f2d 100644
--- a/app/app_controller.php
+++ b/app/app_controller.php
@@ -3,20 +3,14 @@
 // + $Id$
 // +------------------------------------------------------------------+ //
 // + Cake <https://developers.nextco.com/cake/>                       + //
-// + Copyright: (c) 2005 Cake Authors/Developers                      + //
-// +                                                                  + //
+// + Copyright: (c) 2005, Cake Authors/Developers                     + //
 // + Author(s): Michal Tatarynowicz aka Pies <tatarynowicz@gmail.com> + //
 // +            Larry E. Masters aka PhpNut <nut@phpnut.com>          + //
 // +            Kamil Dzielinski aka Brego <brego.dk@gmail.com>       + //
-// +                                                                  + //
 // +------------------------------------------------------------------+ //
 // + Licensed under The MIT License                                   + //
 // + Redistributions of files must retain the above copyright notice. + //
-// + You may not use this file except in compliance with the License. + //
-// +                                                                  + //
-// + You may obtain a copy of the License at:                         + //
-// + License page: http://www.opensource.org/licenses/mit-license.php + //
-// +------------------------------------------------------------------+ //
+// + See: http://www.opensource.org/licenses/mit-license.php          + //
 //////////////////////////////////////////////////////////////////////////
 
 /**
@@ -24,9 +18,7 @@
   * Enter description here...
   *
   * @filesource 
-  * @author Michal Tatarynowicz <tatarynowicz@gmail.com>
-  * @author Larry E. Masters aka PhpNut <nut@phpnut.com>
-  * @author Kamil Dzielinski aka Brego <brego.dk@gmail.com>
+  * @author Cake Authors/Developers
   * @copyright Copyright (c) 2005, Cake Authors/Developers
   * @link https://developers.nextco.com/cake/wiki/Authors Authors/Developers
   * @package cake
@@ -36,7 +28,6 @@
   * @modifiedby $LastChangedBy$
   * @lastmodified $Date$
   * @license http://www.opensource.org/licenses/mit-license.php The MIT License
-  *
   */
 
 /**
diff --git a/app/app_model.php b/app/app_model.php
index fb84bd723..2aa3f5ca0 100644
--- a/app/app_model.php
+++ b/app/app_model.php
@@ -3,20 +3,14 @@
 // + $Id$
 // +------------------------------------------------------------------+ //
 // + Cake <https://developers.nextco.com/cake/>                       + //
-// + Copyright: (c) 2005 Cake Authors/Developers                      + //
-// +                                                                  + //
+// + Copyright: (c) 2005, Cake Authors/Developers                     + //
 // + Author(s): Michal Tatarynowicz aka Pies <tatarynowicz@gmail.com> + //
 // +            Larry E. Masters aka PhpNut <nut@phpnut.com>          + //
 // +            Kamil Dzielinski aka Brego <brego.dk@gmail.com>       + //
-// +                                                                  + //
 // +------------------------------------------------------------------+ //
 // + Licensed under The MIT License                                   + //
 // + Redistributions of files must retain the above copyright notice. + //
-// + You may not use this file except in compliance with the License. + //
-// +                                                                  + //
-// + You may obtain a copy of the License at:                         + //
-// + License page: http://www.opensource.org/licenses/mit-license.php + //
-// +------------------------------------------------------------------+ //
+// + See: http://www.opensource.org/licenses/mit-license.php          + //
 //////////////////////////////////////////////////////////////////////////
 
 /**
@@ -25,9 +19,7 @@
   * 
   *
   * @filesource 
-  * @author Michal Tatarynowicz <tatarynowicz@gmail.com>
-  * @author Larry E. Masters aka PhpNut <nut@phpnut.com>
-  * @author Kamil Dzielinski aka Brego <brego.dk@gmail.com>
+  * @author Cake Authors/Developers
   * @copyright Copyright (c) 2005, Cake Authors/Developers
   * @link https://developers.nextco.com/cake/wiki/Authors Authors/Developers
   * @package cake
@@ -37,7 +29,6 @@
   * @modifiedby $LastChangedBy$
   * @lastmodified $Date$
   * @license http://www.opensource.org/licenses/mit-license.php The MIT License
-  *
   */
 
 /**
diff --git a/config/core.php b/config/core.php
index 9b489e70b..58adff02f 100644
--- a/config/core.php
+++ b/config/core.php
@@ -3,20 +3,14 @@
 // + $Id$
 // +------------------------------------------------------------------+ //
 // + Cake <https://developers.nextco.com/cake/>                       + //
-// + Copyright: (c) 2005 Cake Authors/Developers                      + //
-// +                                                                  + //
+// + Copyright: (c) 2005, Cake Authors/Developers                     + //
 // + Author(s): Michal Tatarynowicz aka Pies <tatarynowicz@gmail.com> + //
 // +            Larry E. Masters aka PhpNut <nut@phpnut.com>          + //
 // +            Kamil Dzielinski aka Brego <brego.dk@gmail.com>       + //
-// +                                                                  + //
 // +------------------------------------------------------------------+ //
 // + Licensed under The MIT License                                   + //
 // + Redistributions of files must retain the above copyright notice. + //
-// + You may not use this file except in compliance with the License. + //
-// +                                                                  + //
-// + You may obtain a copy of the License at:                         + //
-// + License page: http://www.opensource.org/licenses/mit-license.php + //
-// +------------------------------------------------------------------+ //
+// + See: http://www.opensource.org/licenses/mit-license.php          + //
 //////////////////////////////////////////////////////////////////////////
 
 /**
@@ -24,9 +18,7 @@
   * Enter description here...
   *
   * @filesource 
-  * @author Michal Tatarynowicz <tatarynowicz@gmail.com>
-  * @author Larry E. Masters aka PhpNut <nut@phpnut.com>
-  * @author Kamil Dzielinski aka Brego <brego.dk@gmail.com>
+  * @author Cake Authors/Developers
   * @copyright Copyright (c) 2005, Cake Authors/Developers
   * @link https://developers.nextco.com/cake/wiki/Authors Authors/Developers
   * @package cake
@@ -36,7 +28,6 @@
   * @modifiedby $LastChangedBy$
   * @lastmodified $Date$
   * @license http://www.opensource.org/licenses/mit-license.php The MIT License
-  *
   */
 
 // Debugging level
diff --git a/config/database.php.default b/config/database.php.default
index fd506d7cc..095d67f15 100644
--- a/config/database.php.default
+++ b/config/database.php.default
@@ -3,20 +3,14 @@
 // + $Id$
 // +------------------------------------------------------------------+ //
 // + Cake <https://developers.nextco.com/cake/>                       + //
-// + Copyright: (c) 2005 Cake Authors/Developers                      + //
-// +                                                                  + //
+// + Copyright: (c) 2005, Cake Authors/Developers                     + //
 // + Author(s): Michal Tatarynowicz aka Pies <tatarynowicz@gmail.com> + //
 // +            Larry E. Masters aka PhpNut <nut@phpnut.com>          + //
 // +            Kamil Dzielinski aka Brego <brego.dk@gmail.com>       + //
-// +                                                                  + //
 // +------------------------------------------------------------------+ //
 // + Licensed under The MIT License                                   + //
 // + Redistributions of files must retain the above copyright notice. + //
-// + You may not use this file except in compliance with the License. + //
-// +                                                                  + //
-// + You may obtain a copy of the License at:                         + //
-// + License page: http://www.opensource.org/licenses/mit-license.php + //
-// +------------------------------------------------------------------+ //
+// + See: http://www.opensource.org/licenses/mit-license.php          + //
 //////////////////////////////////////////////////////////////////////////
 
 /**
@@ -24,9 +18,7 @@
   * Enter description here...
   *
   * @filesource 
-  * @author Michal Tatarynowicz <tatarynowicz@gmail.com>
-  * @author Larry E. Masters aka PhpNut <nut@phpnut.com>
-  * @author Kamil Dzielinski aka Brego <brego.dk@gmail.com>
+  * @author Cake Authors/Developers
   * @copyright Copyright (c) 2005, Cake Authors/Developers
   * @link https://developers.nextco.com/cake/wiki/Authors Authors/Developers
   * @package cake
@@ -36,7 +28,6 @@
   * @modifiedby $LastChangedBy$
   * @lastmodified $Date$
   * @license http://www.opensource.org/licenses/mit-license.php The MIT License
-  *
   */
 
 /**
diff --git a/config/paths.php b/config/paths.php
index f9845e938..6b3427cb9 100644
--- a/config/paths.php
+++ b/config/paths.php
@@ -3,20 +3,14 @@
 // + $Id$
 // +------------------------------------------------------------------+ //
 // + Cake <https://developers.nextco.com/cake/>                       + //
-// + Copyright: (c) 2005 Cake Authors/Developers                      + //
-// +                                                                  + //
+// + Copyright: (c) 2005, Cake Authors/Developers                     + //
 // + Author(s): Michal Tatarynowicz aka Pies <tatarynowicz@gmail.com> + //
 // +            Larry E. Masters aka PhpNut <nut@phpnut.com>          + //
 // +            Kamil Dzielinski aka Brego <brego.dk@gmail.com>       + //
-// +                                                                  + //
 // +------------------------------------------------------------------+ //
 // + Licensed under The MIT License                                   + //
 // + Redistributions of files must retain the above copyright notice. + //
-// + You may not use this file except in compliance with the License. + //
-// +                                                                  + //
-// + You may obtain a copy of the License at:                         + //
-// + License page: http://www.opensource.org/licenses/mit-license.php + //
-// +------------------------------------------------------------------+ //
+// + See: http://www.opensource.org/licenses/mit-license.php          + //
 //////////////////////////////////////////////////////////////////////////
 
 /**
@@ -24,9 +18,7 @@
   * Enter description here...
   *
   * @filesource 
-  * @author Michal Tatarynowicz <tatarynowicz@gmail.com>
-  * @author Larry E. Masters aka PhpNut <nut@phpnut.com>
-  * @author Kamil Dzielinski aka Brego <brego.dk@gmail.com>
+  * @author Cake Authors/Developers
   * @copyright Copyright (c) 2005, Cake Authors/Developers
   * @link https://developers.nextco.com/cake/wiki/Authors Authors/Developers
   * @package cake
@@ -36,7 +28,6 @@
   * @modifiedby $LastChangedBy$
   * @lastmodified $Date$
   * @license http://www.opensource.org/licenses/mit-license.php The MIT License
-  *
   */
 
 /**
diff --git a/config/tags.php b/config/tags.php
index 9c301d6bf..50406b13d 100644
--- a/config/tags.php
+++ b/config/tags.php
@@ -3,20 +3,14 @@
 // + $Id$
 // +------------------------------------------------------------------+ //
 // + Cake <https://developers.nextco.com/cake/>                       + //
-// + Copyright: (c) 2005 Cake Authors/Developers                      + //
-// +                                                                  + //
+// + Copyright: (c) 2005, Cake Authors/Developers                     + //
 // + Author(s): Michal Tatarynowicz aka Pies <tatarynowicz@gmail.com> + //
 // +            Larry E. Masters aka PhpNut <nut@phpnut.com>          + //
 // +            Kamil Dzielinski aka Brego <brego.dk@gmail.com>       + //
-// +                                                                  + //
 // +------------------------------------------------------------------+ //
 // + Licensed under The MIT License                                   + //
 // + Redistributions of files must retain the above copyright notice. + //
-// + You may not use this file except in compliance with the License. + //
-// +                                                                  + //
-// + You may obtain a copy of the License at:                         + //
-// + License page: http://www.opensource.org/licenses/mit-license.php + //
-// +------------------------------------------------------------------+ //
+// + See: http://www.opensource.org/licenses/mit-license.php          + //
 //////////////////////////////////////////////////////////////////////////
 
 /**
@@ -24,9 +18,7 @@
   * Enter description here...
   *
   * @filesource 
-  * @author Michal Tatarynowicz <tatarynowicz@gmail.com>
-  * @author Larry E. Masters aka PhpNut <nut@phpnut.com>
-  * @author Kamil Dzielinski aka Brego <brego.dk@gmail.com>
+  * @author Cake Authors/Developers
   * @copyright Copyright (c) 2005, Cake Authors/Developers
   * @link https://developers.nextco.com/cake/wiki/Authors Authors/Developers
   * @package cake
@@ -36,7 +28,6 @@
   * @modifiedby $LastChangedBy$
   * @lastmodified $Date$
   * @license http://www.opensource.org/licenses/mit-license.php The MIT License
-  *
   */
 
 /**
diff --git a/index.php b/index.php
index 9d987bd0b..e6368610d 100644
--- a/index.php
+++ b/index.php
@@ -3,29 +3,21 @@
 // + $Id$
 // +------------------------------------------------------------------+ //
 // + Cake <https://developers.nextco.com/cake/>                       + //
-// + Copyright: (c) 2005 Cake Authors/Developers                      + //
-// +                                                                  + //
+// + Copyright: (c) 2005, Cake Authors/Developers                     + //
 // + Author(s): Michal Tatarynowicz aka Pies <tatarynowicz@gmail.com> + //
 // +            Larry E. Masters aka PhpNut <nut@phpnut.com>          + //
 // +            Kamil Dzielinski aka Brego <brego.dk@gmail.com>       + //
-// +                                                                  + //
 // +------------------------------------------------------------------+ //
 // + Licensed under The MIT License                                   + //
 // + Redistributions of files must retain the above copyright notice. + //
-// + You may not use this file except in compliance with the License. + //
-// +                                                                  + //
-// + You may obtain a copy of the License at:                         + //
-// + License page: http://www.opensource.org/licenses/mit-license.php + //
-// +------------------------------------------------------------------+ //
+// + See: http://www.opensource.org/licenses/mit-license.php          + //
 //////////////////////////////////////////////////////////////////////////
 
 /**
   * Enter description here...
   * 
   * @filesource 
-  * @author Michal Tatarynowicz <tatarynowicz@gmail.com>
-  * @author Larry E. Masters aka PhpNut <nut@phpnut.com>
-  * @author Kamil Dzielinski aka Brego <brego.dk@gmail.com>
+  * @author Cake Authors/Developers
   * @copyright Copyright (c) 2005, Cake Authors/Developers
   * @link https://developers.nextco.com/cake/wiki/Authors Authors/Developers
   * @package cake
@@ -34,7 +26,6 @@
   * @modifiedby $LastChangedBy$
   * @lastmodified $Date$
   * @license http://www.opensource.org/licenses/mit-license.php The MIT License
-  *
   */
 
 /**
diff --git a/libs/bake.php b/libs/bake.php
index d68f082eb..588897416 100644
--- a/libs/bake.php
+++ b/libs/bake.php
@@ -3,20 +3,14 @@
 // + $Id$
 // +------------------------------------------------------------------+ //
 // + Cake <https://developers.nextco.com/cake/>                       + //
-// + Copyright: (c) 2005 Cake Authors/Developers                      + //
-// +                                                                  + //
+// + Copyright: (c) 2005, Cake Authors/Developers                     + //
 // + Author(s): Michal Tatarynowicz aka Pies <tatarynowicz@gmail.com> + //
 // +            Larry E. Masters aka PhpNut <nut@phpnut.com>          + //
 // +            Kamil Dzielinski aka Brego <brego.dk@gmail.com>       + //
-// +                                                                  + //
 // +------------------------------------------------------------------+ //
 // + Licensed under The MIT License                                   + //
 // + Redistributions of files must retain the above copyright notice. + //
-// + You may not use this file except in compliance with the License. + //
-// +                                                                  + //
-// + You may obtain a copy of the License at:                         + //
-// + License page: http://www.opensource.org/licenses/mit-license.php + //
-// +------------------------------------------------------------------+ //
+// + See: http://www.opensource.org/licenses/mit-license.php          + //
 //////////////////////////////////////////////////////////////////////////
 
 /**
@@ -25,9 +19,7 @@
   * Used by scripts/add.php
   *
   * @filesource 
-  * @author Michal Tatarynowicz <tatarynowicz@gmail.com>
-  * @author Larry E. Masters aka PhpNut <nut@phpnut.com>
-  * @author Kamil Dzielinski aka Brego <brego.dk@gmail.com>
+  * @author Cake Authors/Developers
   * @copyright Copyright (c) 2005, Cake Authors/Developers
   * @link https://developers.nextco.com/cake/wiki/Authors Authors/Developers
   * @package cake
@@ -37,7 +29,6 @@
   * @modifiedby $LastChangedBy$
   * @lastmodified $Date$
   * @license http://www.opensource.org/licenses/mit-license.php The MIT License
-  *
   */
 
 /**
diff --git a/libs/cache.php b/libs/cache.php
index 2aeec8d78..3eebc2763 100644
--- a/libs/cache.php
+++ b/libs/cache.php
@@ -3,20 +3,14 @@
 // + $Id$
 // +------------------------------------------------------------------+ //
 // + Cake <https://developers.nextco.com/cake/>                       + //
-// + Copyright: (c) 2005 Cake Authors/Developers                      + //
-// +                                                                  + //
+// + Copyright: (c) 2005, Cake Authors/Developers                     + //
 // + Author(s): Michal Tatarynowicz aka Pies <tatarynowicz@gmail.com> + //
 // +            Larry E. Masters aka PhpNut <nut@phpnut.com>          + //
 // +            Kamil Dzielinski aka Brego <brego.dk@gmail.com>       + //
-// +                                                                  + //
 // +------------------------------------------------------------------+ //
 // + Licensed under The MIT License                                   + //
 // + Redistributions of files must retain the above copyright notice. + //
-// + You may not use this file except in compliance with the License. + //
-// +                                                                  + //
-// + You may obtain a copy of the License at:                         + //
-// + License page: http://www.opensource.org/licenses/mit-license.php + //
-// +------------------------------------------------------------------+ //
+// + See: http://www.opensource.org/licenses/mit-license.php          + //
 //////////////////////////////////////////////////////////////////////////
 
 /**
@@ -24,9 +18,7 @@
   * Description:
   * 
   * @filesource 
-  * @author Michal Tatarynowicz <tatarynowicz@gmail.com>
-  * @author Larry E. Masters aka PhpNut <nut@phpnut.com>
-  * @author Kamil Dzielinski aka Brego <brego.dk@gmail.com>
+  * @author Cake Authors/Developers
   * @copyright Copyright (c) 2005, Cake Authors/Developers
   * @link https://developers.nextco.com/cake/wiki/Authors Authors/Developers
   * @package cake
@@ -36,7 +28,6 @@
   * @modifiedby $LastChangedBy$
   * @lastmodified $Date$
   * @license http://www.opensource.org/licenses/mit-license.php The MIT License
-  *
   */
 
 /**
diff --git a/libs/folder.php b/libs/folder.php
index b161d9c9b..1b9d05acb 100644
--- a/libs/folder.php
+++ b/libs/folder.php
@@ -3,20 +3,14 @@
 // + $Id$
 // +------------------------------------------------------------------+ //
 // + Cake <https://developers.nextco.com/cake/>                       + //
-// + Copyright: (c) 2005 Cake Authors/Developers                      + //
-// +                                                                  + //
+// + Copyright: (c) 2005, Cake Authors/Developers                     + //
 // + Author(s): Michal Tatarynowicz aka Pies <tatarynowicz@gmail.com> + //
 // +            Larry E. Masters aka PhpNut <nut@phpnut.com>          + //
 // +            Kamil Dzielinski aka Brego <brego.dk@gmail.com>       + //
-// +                                                                  + //
 // +------------------------------------------------------------------+ //
 // + Licensed under The MIT License                                   + //
 // + Redistributions of files must retain the above copyright notice. + //
-// + You may not use this file except in compliance with the License. + //
-// +                                                                  + //
-// + You may obtain a copy of the License at:                         + //
-// + License page: http://www.opensource.org/licenses/mit-license.php + //
-// +------------------------------------------------------------------+ //
+// + See: http://www.opensource.org/licenses/mit-license.php          + //
 //////////////////////////////////////////////////////////////////////////
 
 /**
@@ -24,9 +18,7 @@
   * Folder structure browser, lists folders and files.
   *
   * @filesource 
-  * @author Michal Tatarynowicz <tatarynowicz@gmail.com>
-  * @author Larry E. Masters aka PhpNut <nut@phpnut.com>
-  * @author Kamil Dzielinski aka Brego <brego.dk@gmail.com>
+  * @author Cake Authors/Developers
   * @copyright Copyright (c) 2005, Cake Authors/Developers
   * @link https://developers.nextco.com/cake/wiki/Authors Authors/Developers
   * @package cake
@@ -36,7 +28,6 @@
   * @modifiedby $LastChangedBy$
   * @lastmodified $Date$
   * @license http://www.opensource.org/licenses/mit-license.php The MIT License
-  *
   */
 
 /**
diff --git a/libs/inflector.php b/libs/inflector.php
index 0e42c029b..fc979c8a9 100644
--- a/libs/inflector.php
+++ b/libs/inflector.php
@@ -3,20 +3,14 @@
 // + $Id$
 // +------------------------------------------------------------------+ //
 // + Cake <https://developers.nextco.com/cake/>                       + //
-// + Copyright: (c) 2005 Cake Authors/Developers                      + //
-// +                                                                  + //
+// + Copyright: (c) 2005, Cake Authors/Developers                     + //
 // + Author(s): Michal Tatarynowicz aka Pies <tatarynowicz@gmail.com> + //
 // +            Larry E. Masters aka PhpNut <nut@phpnut.com>          + //
 // +            Kamil Dzielinski aka Brego <brego.dk@gmail.com>       + //
-// +                                                                  + //
 // +------------------------------------------------------------------+ //
 // + Licensed under The MIT License                                   + //
 // + Redistributions of files must retain the above copyright notice. + //
-// + You may not use this file except in compliance with the License. + //
-// +                                                                  + //
-// + You may obtain a copy of the License at:                         + //
-// + License page: http://www.opensource.org/licenses/mit-license.php + //
-// +------------------------------------------------------------------+ //
+// + See: http://www.opensource.org/licenses/mit-license.php          + //
 //////////////////////////////////////////////////////////////////////////
 
 /**
@@ -26,9 +20,7 @@
   * Test with $i = new Inflector(); $i->test();
   *
   * @filesource 
-  * @author Michal Tatarynowicz <tatarynowicz@gmail.com>
-  * @author Larry E. Masters aka PhpNut <nut@phpnut.com>
-  * @author Kamil Dzielinski aka Brego <brego.dk@gmail.com>
+  * @author Cake Authors/Developers
   * @copyright Copyright (c) 2005, Cake Authors/Developers
   * @link https://developers.nextco.com/cake/wiki/Authors Authors/Developers
   * @package cake
@@ -38,7 +30,6 @@
   * @modifiedby $LastChangedBy$
   * @lastmodified $Date$
   * @license http://www.opensource.org/licenses/mit-license.php The MIT License
-  *
   */
 
 /**
diff --git a/libs/legacy.php b/libs/legacy.php
index b4b9805a4..05adc7072 100644
--- a/libs/legacy.php
+++ b/libs/legacy.php
@@ -3,20 +3,14 @@
 // + $Id$
 // +------------------------------------------------------------------+ //
 // + Cake <https://developers.nextco.com/cake/>                       + //
-// + Copyright: (c) 2005 Cake Authors/Developers                      + //
-// +                                                                  + //
+// + Copyright: (c) 2005, Cake Authors/Developers                     + //
 // + Author(s): Michal Tatarynowicz aka Pies <tatarynowicz@gmail.com> + //
 // +            Larry E. Masters aka PhpNut <nut@phpnut.com>          + //
 // +            Kamil Dzielinski aka Brego <brego.dk@gmail.com>       + //
-// +                                                                  + //
 // +------------------------------------------------------------------+ //
 // + Licensed under The MIT License                                   + //
 // + Redistributions of files must retain the above copyright notice. + //
-// + You may not use this file except in compliance with the License. + //
-// +                                                                  + //
-// + You may obtain a copy of the License at:                         + //
-// + License page: http://www.opensource.org/licenses/mit-license.php + //
-// +------------------------------------------------------------------+ //
+// + See: http://www.opensource.org/licenses/mit-license.php          + //
 //////////////////////////////////////////////////////////////////////////
 
 /**
@@ -25,9 +19,7 @@
   *
   * 
   * @filesource 
-  * @author Michal Tatarynowicz <tatarynowicz@gmail.com>
-  * @author Larry E. Masters aka PhpNut <nut@phpnut.com>
-  * @author Kamil Dzielinski aka Brego <brego.dk@gmail.com>
+  * @author Cake Authors/Developers
   * @copyright Copyright (c) 2005, Cake Authors/Developers
   * @link https://developers.nextco.com/cake/wiki/Authors Authors/Developers
   * @package cake
@@ -37,7 +29,6 @@
   * @modifiedby $LastChangedBy$
   * @lastmodified $Date$
   * @license http://www.opensource.org/licenses/mit-license.php The MIT License
-  *
   */
 
 if (version_compare(phpversion(), '5.0') < 0) {
diff --git a/libs/object.php b/libs/object.php
index 20ac5a8d3..b09ed7dec 100644
--- a/libs/object.php
+++ b/libs/object.php
@@ -3,29 +3,21 @@
 // + $Id$
 // +------------------------------------------------------------------+ //
 // + Cake <https://developers.nextco.com/cake/>                       + //
-// + Copyright: (c) 2005 Cake Authors/Developers                      + //
-// +                                                                  + //
+// + Copyright: (c) 2005, Cake Authors/Developers                     + //
 // + Author(s): Michal Tatarynowicz aka Pies <tatarynowicz@gmail.com> + //
 // +            Larry E. Masters aka PhpNut <nut@phpnut.com>          + //
 // +            Kamil Dzielinski aka Brego <brego.dk@gmail.com>       + //
-// +                                                                  + //
 // +------------------------------------------------------------------+ //
 // + Licensed under The MIT License                                   + //
 // + Redistributions of files must retain the above copyright notice. + //
-// + You may not use this file except in compliance with the License. + //
-// +                                                                  + //
-// + You may obtain a copy of the License at:                         + //
-// + License page: http://www.opensource.org/licenses/mit-license.php + //
-// +------------------------------------------------------------------+ //
+// + See: http://www.opensource.org/licenses/mit-license.php          + //
 //////////////////////////////////////////////////////////////////////////
 
 /**
   * Purpose: Object
   *
   * @filesource 
-  * @author Michal Tatarynowicz <tatarynowicz@gmail.com>
-  * @author Larry E. Masters aka PhpNut <nut@phpnut.com>
-  * @author Kamil Dzielinski aka Brego <brego.dk@gmail.com>
+  * @author Cake Authors/Developers
   * @copyright Copyright (c) 2005, Cake Authors/Developers
   * @link https://developers.nextco.com/cake/wiki/Authors Authors/Developers
   * @package cake
@@ -35,7 +27,6 @@
   * @modifiedby $LastChangedBy$
   * @lastmodified $Date$
   * @license http://www.opensource.org/licenses/mit-license.php The MIT License
-  *
   */
 
 /**
diff --git a/libs/time.php b/libs/time.php
index 7c5d9f6a1..da0da6cb0 100644
--- a/libs/time.php
+++ b/libs/time.php
@@ -3,20 +3,14 @@
 // + $Id$
 // +------------------------------------------------------------------+ //
 // + Cake <https://developers.nextco.com/cake/>                       + //
-// + Copyright: (c) 2005 Cake Authors/Developers                      + //
-// +                                                                  + //
+// + Copyright: (c) 2005, Cake Authors/Developers                     + //
 // + Author(s): Michal Tatarynowicz aka Pies <tatarynowicz@gmail.com> + //
 // +            Larry E. Masters aka PhpNut <nut@phpnut.com>          + //
 // +            Kamil Dzielinski aka Brego <brego.dk@gmail.com>       + //
-// +                                                                  + //
 // +------------------------------------------------------------------+ //
 // + Licensed under The MIT License                                   + //
 // + Redistributions of files must retain the above copyright notice. + //
-// + You may not use this file except in compliance with the License. + //
-// +                                                                  + //
-// + You may obtain a copy of the License at:                         + //
-// + License page: http://www.opensource.org/licenses/mit-license.php + //
-// +------------------------------------------------------------------+ //
+// + See: http://www.opensource.org/licenses/mit-license.php          + //
 //////////////////////////////////////////////////////////////////////////
 
 /**
@@ -24,9 +18,7 @@
   * Time related functions, formatting for dates etc.
   *
   * @filesource 
-  * @author Michal Tatarynowicz <tatarynowicz@gmail.com>
-  * @author Larry E. Masters aka PhpNut <nut@phpnut.com>
-  * @author Kamil Dzielinski aka Brego <brego.dk@gmail.com>
+  * @author Cake Authors/Developers
   * @copyright Copyright (c) 2005, Cake Authors/Developers
   * @link https://developers.nextco.com/cake/wiki/Authors Authors/Developers
   * @package cake
@@ -36,7 +28,6 @@
   * @modifiedby $LastChangedBy$
   * @lastmodified $Date$
   * @license http://www.opensource.org/licenses/mit-license.php The MIT License
-  *
   */
 
 /**
diff --git a/libs/validators.php b/libs/validators.php
index cd071cb53..fd9b135d6 100644
--- a/libs/validators.php
+++ b/libs/validators.php
@@ -3,20 +3,14 @@
 // + $Id$
 // +------------------------------------------------------------------+ //
 // + Cake <https://developers.nextco.com/cake/>                       + //
-// + Copyright: (c) 2005 Cake Authors/Developers                      + //
-// +                                                                  + //
+// + Copyright: (c) 2005, Cake Authors/Developers                     + //
 // + Author(s): Michal Tatarynowicz aka Pies <tatarynowicz@gmail.com> + //
 // +            Larry E. Masters aka PhpNut <nut@phpnut.com>          + //
 // +            Kamil Dzielinski aka Brego <brego.dk@gmail.com>       + //
-// +                                                                  + //
 // +------------------------------------------------------------------+ //
 // + Licensed under The MIT License                                   + //
 // + Redistributions of files must retain the above copyright notice. + //
-// + You may not use this file except in compliance with the License. + //
-// +                                                                  + //
-// + You may obtain a copy of the License at:                         + //
-// + License page: http://www.opensource.org/licenses/mit-license.php + //
-// +------------------------------------------------------------------+ //
+// + See: http://www.opensource.org/licenses/mit-license.php          + //
 //////////////////////////////////////////////////////////////////////////
 
 /**
@@ -24,9 +18,7 @@
   * Used to validate data in Models.
   *
   * @filesource 
-  * @author Michal Tatarynowicz <tatarynowicz@gmail.com>
-  * @author Larry E. Masters aka PhpNut <nut@phpnut.com>
-  * @author Kamil Dzielinski aka Brego <brego.dk@gmail.com>
+  * @author Cake Authors/Developers
   * @copyright Copyright (c) 2005, Cake Authors/Developers
   * @link https://developers.nextco.com/cake/wiki/Authors Authors/Developers
   * @package cake
@@ -36,7 +28,6 @@
   * @modifiedby $LastChangedBy$
   * @lastmodified $Date$
   * @license http://www.opensource.org/licenses/mit-license.php The MIT License
-  *
   */
 
 /**
diff --git a/public/index.php b/public/index.php
index 351b9cb30..0a51647db 100644
--- a/public/index.php
+++ b/public/index.php
@@ -3,29 +3,21 @@
 // + $Id$
 // +------------------------------------------------------------------+ //
 // + Cake <https://developers.nextco.com/cake/>                       + //
-// + Copyright: (c) 2005 Cake Authors/Developers                      + //
-// +                                                                  + //
+// + Copyright: (c) 2005, Cake Authors/Developers                     + //
 // + Author(s): Michal Tatarynowicz aka Pies <tatarynowicz@gmail.com> + //
 // +            Larry E. Masters aka PhpNut <nut@phpnut.com>          + //
 // +            Kamil Dzielinski aka Brego <brego.dk@gmail.com>       + //
-// +                                                                  + //
 // +------------------------------------------------------------------+ //
 // + Licensed under The MIT License                                   + //
 // + Redistributions of files must retain the above copyright notice. + //
-// + You may not use this file except in compliance with the License. + //
-// +                                                                  + //
-// + You may obtain a copy of the License at:                         + //
-// + License page: http://www.opensource.org/licenses/mit-license.php + //
-// +------------------------------------------------------------------+ //
+// + See: http://www.opensource.org/licenses/mit-license.php          + //
 //////////////////////////////////////////////////////////////////////////
 
 /**
   * Enter description here...
   * 
   * @filesource 
-  * @author Michal Tatarynowicz <tatarynowicz@gmail.com>
-  * @author Larry E. Masters aka PhpNut <nut@phpnut.com>
-  * @author Kamil Dzielinski aka Brego <brego.dk@gmail.com>
+  * @author Cake Authors/Developers
   * @copyright Copyright (c) 2005, Cake Authors/Developers
   * @link https://developers.nextco.com/cake/wiki/Authors Authors/Developers
   * @package cake
@@ -35,7 +27,6 @@
   * @modifiedby $LastChangedBy$
   * @lastmodified $Date$
   * @license http://www.opensource.org/licenses/mit-license.php The MIT License
-  *
   */
 
 /**
diff --git a/scripts/add.php b/scripts/add.php
index 3bd06cca6..ba3edf530 100644
--- a/scripts/add.php
+++ b/scripts/add.php
@@ -4,29 +4,21 @@
 // + $Id$
 // +------------------------------------------------------------------+ //
 // + Cake <https://developers.nextco.com/cake/>                       + //
-// + Copyright: (c) 2005 Cake Authors/Developers                      + //
-// +                                                                  + //
+// + Copyright: (c) 2005, Cake Authors/Developers                     + //
 // + Author(s): Michal Tatarynowicz aka Pies <tatarynowicz@gmail.com> + //
 // +            Larry E. Masters aka PhpNut <nut@phpnut.com>          + //
 // +            Kamil Dzielinski aka Brego <brego.dk@gmail.com>       + //
-// +                                                                  + //
 // +------------------------------------------------------------------+ //
 // + Licensed under The MIT License                                   + //
 // + Redistributions of files must retain the above copyright notice. + //
-// + You may not use this file except in compliance with the License. + //
-// +                                                                  + //
-// + You may obtain a copy of the License at:                         + //
-// + License page: http://www.opensource.org/licenses/mit-license.php + //
-// +------------------------------------------------------------------+ //
+// + See: http://www.opensource.org/licenses/mit-license.php          + //
 //////////////////////////////////////////////////////////////////////////
 
 /**
   * Enter description here...
   * 
   * @filesource 
-  * @author Michal Tatarynowicz <tatarynowicz@gmail.com>
-  * @author Larry E. Masters aka PhpNut <nut@phpnut.com>
-  * @author Kamil Dzielinski aka Brego <brego.dk@gmail.com>
+  * @author Cake Authors/Developers
   * @copyright Copyright (c) 2005, Cake Authors/Developers
   * @link https://developers.nextco.com/cake/wiki/Authors Authors/Developers
   * @package cake
@@ -36,7 +28,6 @@
   * @modifiedby $LastChangedBy$
   * @lastmodified $Date$
   * @license http://www.opensource.org/licenses/mit-license.php The MIT License
-  *
   */
 
 /**