Parameters adjusts and PHPCS formatting