Fix issues highlighted by CakePHP Code Sniffer