More fixes to fullfil cakephp code style rules.