Improve Zend coding standards compliance