PHP Coding Standards fixes