Fixing code style issues from php-cs-fixed and phpcs