Fixing to comply with CakePHP CS