More PHPCS configuration and cleaning code to match standard