Improved support for CakePHP style - more spacing issues