Further adoption of the CakePHP code conventions