PHPCS fixes, whitespace, visibility, alignment