Fixed phpcs issues in files