Update comment blocks to CakePHP standard
Update whitespace to CakePHP standard