Cs fixes

Applied cs fixes.

__Note__
* Needed to rename two private methods
* Method signatures do not always match with the (current) CakePHP API